Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron

FFIB 2 gadi atpakaļ
vecāks
revīzija
3c74dfbc85
2 mainītis faili ar 2 papildinājumiem un 3 dzēšanām
  1. 1 2
      api/tenancy_admin_views.py
  2. 1 1
      tenancy/models.py

+ 1 - 2
api/tenancy_admin_views.py

@@ -3,12 +3,11 @@
3 3
 from __future__ import division
4 4
 
5 5
 from django.db import transaction
6
+from django.db.models import Q
6 7
 from django_logit import logit
7 8
 from django_response import response
8 9
 from paginator import pagination
9 10
 from TimeConvert import TimeConvert as tc
10
-from django.db.models import Q
11
-
12 11
 
13 12
 from api.tenancy_views import tenancy_tracking_info_subscribe
14 13
 from kodo.decorators import check_admin

+ 1 - 1
tenancy/models.py

@@ -38,7 +38,7 @@ class TenancyShotInfo(BaseModelMixin):
38 38
     def data(self):
39 39
         try:
40 40
             model = ModelInfo.objects.get(model_id=self.model_id, status=True)
41
-        except:
41
+        except ModelInfo.DoesNotExist:
42 42
             model = None
43 43
         return {
44 44
             'shot_id': self.shot_id,